Paper based shadow
Merge branch 'shadow'

Conflicts:
	todo.txt