Add in dependencies and get rid of underscore.