Version 0.1 - Initial capability complete and minor refactoring.