Lots of Cleanup and Adding State Messages