will be updated as I work on and test controller