Add comments and stuffz
Complete merge