Add threading to store loading and general cleanup