More prototyping

Signed-off-by: Sina Madani <sinadoom@googlemail.com>
22 files changed