First steps to making settings async