Made a few changes, double parens need more work
merge with connor
t push origin masterMerge branch 'casercion-patch-1'