Continue work on HMVC implementation (part 2)