more work, works kinda now..