commit trunk

new architecture