Cleaned up some more. Need to add a header.: