Newest commit, complete redo of shit