cleanup
fix tests
working modal to add loads