Merged w/ master to get working on a live test server. Now working on getting existing code working with new UI.