Shifts just some code down for now. I'll do the rest of the refactor in the next pr, but didn't want to drop a huge refactor.