Switched over to a "Workspace" to fix a bug. Some bug with Xcode I guess. Also added a few controllers