Working on composition controller, few changes to base