More debugging
Add running capabilities