Convert adapaters to connections and models
handle errors
remove todos and other unecessary comments
clean up spacing