Merged Brandons code into main project
Merged Brandons Code into main Project