Working build
Reformatting
Working find usages for constructors