Added deps and stripped back to basic functionality