first set of changes, needs developing