Updated according to lessons learned. Added signup. fix #6 #4