Add most functionality and clean up extension/page/server conversation