added functions for remaining forms, added Roger's Jaxb2 files