addEntry is fully functional. Ugly, but fully functional.