Ready to merge cap'n