Moved things around and statred work on initializing the PM