removed unimplemented functionality; merge it back in if it's completed