solved.  now need to make prettier