First iteration, further testing needed to see if it is sufficient.

Signed-off-by: Even Wiik Thomassen <eventh@gmail.com>