WIP commit
Making sure shit still works
More edits before tackling the issue that sent me on this spiral. thing work.