Moving things to the right place. Still have some TODOs