Complete makeover

Refs #LS-38 #LS-43