Finished migration of Step.java, improved Threading