turn into a dub package
remove shit
ready to merge