Adding from ASIS, fixed some links from before...

:)