Continuation of User Module

Progress with user module (functionality not tested)