Commit of work so far

Basics is up and running.