Don't mind my last 4 commits. Added the stuff Victoria was talking about