starting work on indexed keys
refactored atomtype into core