Small Updates

Separated State initialization from Group initialization; we duplicate
function calls but the process is much clearer overall.