Basic framework added, ready for heuristics gathering