Fresh Start

Had to make a copy of everything and adjust few things as they were not
working as expected.