design wip
tidy, switch to new queue