redesigning/refactoring/cleaning/minor bug fixes, problem solver to come