Integrated frontend code
Re-added the files that I blew away idiotically.
Merge pull request #1 from jargv/master

Integrated frontend code