Lots of little changes. Some tests. More co.