Simplified the whole architecture, and removed 2 controllers that were confusing matters. Fixes #33