Working on edit, made some progress