Defines created but not yet fully incorporated. Indexing and NSNumber <—> int issues resolved