Added user support, initial testing