Yet another update
A series of changes that will modify the whole structure of it.