Looks like edits are working
Added test, fixed some stuff