Major clean up; not done, just at a spot to commit