major refactor 4 of 3

..