Wrapped up work for a prudent first release