version 0.8 adding comments/rework model