Initial commit
Updated for new config api