Established framework a bit.
Added some more infrastructure.