A small commit to finish the train of thought - WIP