small refactor
Bounds
Did a lot
Commited new stuff