Wip 0.7

OK this should be better. Also includes resize.
This set of headers are duplicates I think