frontend work
Merge pull request #17 from nastysloper/frontend_work

frontend work