Development Build 20jan

Working on bugs