Pulling in stuff from main repository

Doing this via GitHub because I can't get the terminal to work.