Rewrite and update to work again
Update readme