more work wip
rename class and move logic around
working
1st test
extra removal