Addword field implemented (some TODOs are still here)