Exception handling for factories
Remove some old code
Add notes about validation that needs to be done