Let me know if this uploads correctly

Still not sure I'm doing this correctly, but here is the combined class