Revert last commit, I'll work on this later