Refactored. Added Crust Placeholder.