some reordering, added ui stubs and a class to compare different heuristics
Merge remote-tracking branch 'origin/master'