Bugs fixed and working model, need to implemenent enhancements now