doing some cleanup to start working on this again