Simplified Post code, ready for integration testing