Finally done right!

This setup is a clusterfuck.