Began adapting source.hpp