Lots of stuff and close #75