Kh - Fix current singer becoming inaccurate on singer deletes
Kh - Random minor code cleanup/refactoring
Kh - Beginnings of moving DB stuff into a single class