Merge "Fixing build and continuing refactor" into klp-dev