Fixed #74, but still don't have the whole interface working again yet.