Updating for first functional version of core, first test and updates on example