cleanup
wip
starting over major refactoring
refactored basic extensions
renamed stuff