Initial adaption of sketchy code, non-functional