Experimental

Fixing/adding some stuff to improve functionality.