Finished class diagram

Andrew, this is probably very wrong. I apologize, let me know what is
wrong and I'll try and fix it as soon as I can