Finally get it to basically work