What in the actual fuck did I write today?! This works now...

Also regarding #15