Newest Changes

Final changes to my project for now