testing
wip
Refined names, still doesn't balance right, looking for issues