Started a second revision of the system.
Note: Probably need to split part of the code out to a separate module.