cleaned up assignment 1 + added assignment 3