More work done on edit-listing. Fun stuff!
Dang merge conflicts...