cleaned up code but still need to add content