Started working on order completion