Making new code compile, testing soon.