Actually, nevermind, going to take a quick pass at this branch myself-