Initial commit of overhaul