Development build 23 jan

Working on bugs