more controller wwork
Merge pull request #3 from Lokithor/add-better-controllers

more controller work