Wrote some more of the catch graphic stuff