WIP
major cleanup
add collections to items