A lot of uncommitted garbage to get the site live for Volksfling - this needs serious revision