Added all changes in beta1 and beta3.
Still very rough (needs reordering etc.).
1 file changed