#451 Refactor

More Refactor and IA problem solved, now IA is moving.