Updating implementation to simplify things and rename, updating readme to match