lots of new changes. attempting a very rapid dev pace