Move Order to a separate class
Use int instead of Integer