Work in progress

Refactoring need.

Signed-off-by: anton <haglundanton+github@gmail.com>