Code refactoring with Nick. Reorganized into classes. Much easier to parse. Working on select statements