Added order controller, modified order class