More documentation, structure already in mind