Got Bean validation working
Fixed merge conflicts