First draft for issue #87 | Still WIP, need feedbacks