Move stuff around
Add todo