completed prelminary tests, changed variable storage types