initial prototype

various changes for the initial prototype, which is to be demoed during the review