Integration of Tobis work

I tried to do this as seamlessly and unintrusive as possible. It
compiles but shows no real output. I guess this is because of model
files not being loaded correctly as of now.