added lookup table and automatic additions
added empty tests to be implemented later