Tested with visualization current stage

closes #19