Front end

Creating a pull request and merging based on @mkmcdonald's work