playing with parsing algorithm
commit what I have and start to clean it up
moving to 2.1.4, I will git ignore this in the next couple of commits