devise, redesign, huge commit