combined to forms into one. style is broken a bit now. refs #28