Latest update with some validation WIP