Merging Manually - End of Sprint 1

Adding Yang's functionality to a Visual Studio Project. Dipan's code is
still on the to-do list of things to add in to the baseline.