Adds support for internal steps

Conflicts:
	src/main.cpp