Beginning of of a much better interface overhaul.