Catchup
Update for octothorpe
Edit functionality