loooooooots of changes

more detailed writeup on architecture changes WIP