Yes, these are just to show what I did. I'll update the branch if the classes work for everything we need.