reverted to before bugg
Readded BoundsFinder
Refactored DataType enum