edits towards actual extension functionality