tidying up classes. DOne for the night. I think...