WIP fixup close()
WIP