Working

Did stuff to make it work