major architecture change incoming
now time for big change