Development Build 12 feb

Working on changes