Works mostly

This looks like it's working!