Adding parts of bootstrap. Moving up to V002 with bug dependencies