Almost done, just need to doc & fix the date illegality thingy