Some more work... Need to have a better idea of what I'm doing