last commit before presentation -- still needs lots of work