Working toward functionality again!