More forum work, added HomePage type (may need rename)