Completes Phase 2, fixes create subs bug