first commit pre-redesign