port of singletable mostly done