Phase II Ready

Fixes for Phase II