Re-working the tent system, trying to...

get it all to work