Added custom payment method and did some cleanup