Basic framework is in place, and memory issues seem to be fixed.