refactor controllers, && adding, editing, removing front end notes
merge