More ruby-like ways of doing things. Starting to port everything over to promotion.