Faster this way
New quesiton types broke the variants. Fixed and cleaned up. Closes #28