#11 adding some very basic logic