Final commit. Added commits, clean build