More templates for overriding.
Un-style update
Updated README and added empty TODO