Cutting the fat.
Version 0.1.2 - More OOP-like.