Things kind of work
Fix more stuff, but still broken