More code

Some more WIP code to add as part of my current research topic