Simplify program as is, Next add features