This is a scary commit--I worked on this way too late