Everything for the whole thing done, with the exception of the core refactor