refactored, editing/deleting works, adding almost works