initial commit - still lots of errors, but I need to switch to a clean trunk for releasing and testing