Fix most things, should be working now

Still minutes for testing