Fixed some errors and did some manual merging. Note this is set to SOFTWARE ONLY mode so turn that off in the config.