More memory work... TODO Unit Tests...