finishing new architecture (still lacks testing)