still need to fix border and add extensions