Revert "Initial messy running code"

This reverts commit 362cc3c86e451d88a4771762c36e715b78a200c2.
Revert "Revert "Initial messy running code""

This reverts commit e95cba41ab1399fcf37bbd55012ae8c6fb43719f.
Commit missed source code changes