Initial Commit. Major cleanup incoming