First commit from new computer; removed many unnecessaary #includes