Fixed commands running cleanly when file is changed...wired up classes to be independent of eachother