Factored code. Fixed issues. Mostly.