Barely working

Lots of changes.