Lots more changes

Not really sure where this stands