ugh improvements wip
refactor to accommodate codezu structure