Andrew fixed up classes

He better not break anything