merging from remote origin

- These are changes I did yesterday and had to re-get
- TODO: clean up commit history
Added TODO file