Still not right yet, but closer