Progress so far... Meh it's not very neat. #frown