started again
merged old code and started testing