Reworking exercise 2 to be able to use it in the web service. Also fixing the problem with NULLs in that exercise.