Preparing for major refactor + cleanup