Some bugs.  Committing to make sure I don't break production tasked.