initial commit after redesign