wip
wip
stuck with removal of extras