Configuration changes

Still need imports and try/catches,