Dev branch

first major commit of working development branch