Some work on the stdlib