Tables 'n stuff

Signed-off-by: Philip Vanloo <philip.vanloo@kahosl.be>