Development Build 28 jan

Working on bugs