heavy stuff retrofitting everything in #142. Now framework stuff is working + some individual modules