Delete declaration
Basic changes and done
Add unit tests
Add to factories