Jack 001

Pulling jack_001 branch to master.