Temporary commit while changing workstations

Temporary commit in between developing at work and home.