Update to get stuff working
Fix everything