Cleanup
Add controller example