Pubstwo 995

This is currently correct, but there are some inconsistencies in the java code. Heads up that it may flip to validationErrors at any time.