am 6d02eb62: am 937223d4: am 582393a1: Merge "Fixing build and continuing refactor" into klp-dev

* commit '6d02eb62f0cf4bbf86d6d4c962776dcb19d9f93b':
  Fixing build and continuing refactor