First part of some code has been added (warning: in progress!)