Adds first cut at formatting framework