Partly working..Needs more work