Note to self: Test the bugs before adding them.