2nd working build. addl functions