Code Review PR

A lot happening in this `ready`, IMO You should break it up.