added payment button actions- change gui to take a server
fixing conflicts
pulled new formatted output version and merged