Benjamin3

Did some refactoring.  Moved some functionality to application helper.