WIP - Compiles with -Wextra -Wall -Werror :-)