Complete initial attempt, build against 0.1