Added more controllers, fixed merge stuff