Updated files. Added @ command feature. Need to fix stuff