Motion2 -> Reduce code
State2 -> Fix nasty state propogation bug.  This one was plaging me for a while.  Bunch of changes made to optimize code and all 118 unit tests now pass.