Many changes, code is broken bugs need to be sorted out.