Moved things around a bit and introduced some small improvements
Added test and edited template.