Updated: Version 1.7.0-SNAPSHOT

The whole thing is much more object-oriented and cleaner!