my final changes as far as 9th march project merge