I failed, messed up two classes. Hopefully this works