further changes, manage in users still needs logic and insert statements