One more thing that seems to have gone MIA during the rebase. These should be in a separate subfolder to try and structure things more clearly.