better handling of extras
wip