Moved stuff that slowed dev in to publish