reorganized some files, fixed a stupid fucking bullshit goddamned motherfucker of a bug with adding contacts, still not 100%