Wrote some more code. Need to think about redesigning.