Might have just been a problem with changes I made on the branch "scott_refactoring", but will require investigation regardless.