Fixed syntax errors. Can't figure out why tenure won't load so I uncommented it
modified tenure. All tests pass. Ignore controller.
Some merging issues sorted out
More merging