First quick hack of key implementation