Some last commits before I put this on the shelf