Major rework in progress.
Cumlate users points and various rework.
Rework tests.
Major rework done.