pre-alpha working version

Merge working version of bare-bone but functional app.