tmp - working on cleaning up as per style guide - broken