Added Commands file and called methods later. Fixed some code