Converting to config-based system. Closes #3