Replace with old version of tyrons code, hopefully I can pull without conflicts now