Started work on Refactoring, Added Ashley, and Fixed Move closer to