Updating to brand new version. Working on consolidation