Working on fixing border...not done