#59 - Continued work on config