Big commit, includes changes for payment gwy