Just commiting some progress.
#ch-31 Fixed work 4h