State Manager Added

Basic State Manager added- Still work to be complete and cleaning up of
files