second commit - almost done

Signed-off-by: breadam <bilgi@breadam.com>