Lots of Changes...Again
Almost done!