Complete overhaul to require forge eventually