Stuff still broken.

Not entirely sure what to do, looking at other example to try and fix.
Added some more stuff, hopefully it will help in the future.