Work on contractor, base code done