begin abstraction of plane
working draw abstraction
fix merge problems