Use command line arguments and add TODO