Initial commit part 3

Signed-off-by: Alex Rydzak <alex@rydzak.me>