mostly toDos, and a hacky temp. refresh