Simplified old crust. TODO: Remove all unused methods and provide a test harness