integrate gridx model
refactor data propogation