Second commit, added some auto complete for orders