Consolidation! Factories! Tests!

Resolves #3