Added a PropertiesLoader, wasn't as straight forward to implement as I hoped, so I abandoned implementing it. Gonna leave the code in though.