clean but plenty todo