Ticket #3 not yet finished, blocked by #7



Signed-off-by: Luca Fulchir <luker@fenrirproject.org>