Added various other stuff, including the first JOINs I ever did :). Final commit before the presentation