matching and some base front end stuff to avoid merge conflicts
Merge pull request #11 from travis6888/frontend_work

matching and some base front end stuff to avoid merge conflicts