template tags, lot of changes etc, not finished yet