a big messy commit with shamefully no tests