'Pre-editing' commit. Added 'Purge' functionality, fixed nullPointers