Everything works now.
Just need to cleanup unused code and other crap left around from trying stuff.