added random stuff to rebase off the topic branch of retail onto master