huge scary awesome(?) commit before presentations