Fixed Order Entry stuff, merged to one project