Added somethings in what do to
Fixed object/loader/factory
Actually added files
Added some small box things
Fixed merge