Brian's branch

Merging changes to application.