Still needs a lot more work but slowly getting there