src changes 3

Compiles but has some functionality commented out (which don’t compile
if added in)