reverting forward to latest commit
merged changes
closer to working - only memData loads not working