Development Build 29 jan

Working on issues