Added a bunch of stuff, still broken though