Matt Baer
Move more functionality to web-core package #writeas