remove old API calls
add guava dependency
refactor everything, abstract out command
remove incorrect class from CLI