major refactoring near complete, functional except sliders