Completed initial comps from @guitrasher