Complete redesign that is much cleaner.