I promise to clean this up at a later point, but didn't want to mess with it too much before it can even be seen by Kieran/etc.