WIP. with eval hack. fuck it.
WIP. cleaning