Add todo note
Fix some bugs in the new shaders
Wire everything up