cleaned up routing and prepared for payment workflow