Interface Overhaul for 0.11.0