Updated to add support for lights... still not working though.