WIP adapted templates a bit, connections missing