ALL unencrypted funtionality finished (both tables)