added base template, bunch of other things