wip
got rid of weird template structure
wip
wip