controller layer changes

dfg
Merge pull request #2 from janfasola6git/feat1

controller layer changes