Code is fixed up. Nice structure now.