Visual Studios acting again on laptop, committing changes for desktop.

Implemented more library control, renamed and refactored code