more updates and moving to controllers