Cleaning up and trying to get this working