started adding configuration stuff back in