starting to add border support #2