Should be mostly done, bug hunt time