Initial commit of dblank's work