Started Stage II: a little bit of re-factoring, initial search tree