Development Build 25 jan

Working on issues