Dictionary functions now appear to be working correctly