Squashed commit of the following:
bigfoot template based implemented