Just moved things around a tiny bit
Working nicely now