ugh, joomy!!!! im trying to restructure in a logical way
merge