FEATURE: Improved frontend (in progress)