More progress on signup - may not work