Finishing things up, added a config