about half of the problems down. will finish and refactor tomorrow.