cleaning out, working on final submit