All the things josh forgot to commit