Finally got around to cleaning up the controller cabinet! Still working on setting everything up through the Apex, but this is a big relief!