Finished first cut of using controller