Changed controller functionality

Some nice scope inheritance going on here :3