refactor func names; and add time command