Changed loads of stuff and switched to neobundle