Resource fixes.
Slight refactoring.
Implemented the Mojo.