Feature/core refactor

DONT MERGE.
yet.