Still tweaking things to get lighting working