Moved old stuff to legacy branch and start afresh with hope