development build 21jan

Working on issues