More reworking; iCore is temporarily deprecated and will no longer be updated (at least for a while)