first commit
updated controller
updated controller files
fixed m conflict