Final Commit

Everything should work now, in theory