3rd commit with borders and stuffs