Refactoring essentially done for now. Starting work on "parent" keyword.