Building, work done on the handle base class
Merge conflict