Refactor and clean up
Web up and running
Refactor and cleanup
Refactor - Renamming
Criteria toolbox removed.

Replaced by factory methods