Computer change commit

Just a quick commit to sync changes made on laptop to my desktop
computer. May not be fully functional. Will commit again once I've
worked out more stuff.