Add ability to draw results, code cleanup