should be ready for testing now
adding variables for new options