removed extra functions. Moving to a simpler to understand setup. Probably an older style, but hey, we are learning here,