Features alignment done
Hero unit scaffold