Continued 2.3 work... Check the description to see it all.

Added everything but the hashes and method for displaying on FS side for
verification.