bringing this code base into the 21st century