Got everything working and updated!
Add status validations