merge conflict
minor update
minor changrs
split up controllers and updated seed file