completed a function or two. possible restructuring coming