stopping point for redesign!