Runnable 2.0

Fully functional but needs more testing. More commenting required as
well as checking