WIP: reorganzing + adding theory