added mod 1 and 2 of what ive done