Pushing latest skeleton

Template engine is not working due to it being
from a different system. I will work on it tomorrow
and make it work with our system. Perhaps a fork
would have been nicer.