finished controller skeleton
merging controller_skeleton with master