Clean up marks folder
Clean up marks folder
Add missing marks
Move campus and color marks into for each loops
Tweak TEST output