Development

Development seems stable, let's merge it in.