Added some stuff, still broken