Improved second assignment. Still not complete.