Changed template stuff and TODO
remove bullshit container