Commit current work

Signed-off-by: Andrew Andrianov <andrew@ncrmnt.org>