various changes, started order model