Added some more.. still not working