*finished some TODOs