Looks like it's almost finished. Added base computations from the rfc