Fixes issue #5

Also added some partial code of the new forum upgrade.