clarify
get it to compile
fix everything but the optimality tests