Does it work now?

Awesome job! Go ahead and merge this back into master.