rebuilding and updating based off an old version i saved last year, taking this opportunity to build from the ground up