HW2 - P4

May be tweaked further to improve cases, numbers etc