Think I've gotten most of the unecessary stuff out. Time to do the
method descriptions etc.