Making more functions external.
Compiles. Don't know if it works, but it compiles.