cleaned up and preparing to add shadows