Moved extra files into multiple_forms branch
Change option basePoint to format