Commit 1 of n

Signed-off-by: Dimitrios Mandekis <mandekisd@gmail.com>