Done abit of Assignment 1