Fixed #13, finished some of yesterday's work