Whoops, forgot to include these two classes in the last commit.