initial commit
multiple changes on the road to beta