moving lots of things around, prepping to push this to mvn