Assigment 2 & 3 initial commits