Updated loads fo stuff, not complete