Refactored in full, implemented Order details