Mostly Done

Primarily just confirming if a class file need more work or not
comments yo