Minor fixes but its working. version 2 is go.