finally got around to adding edit, merged with view