FInish playing with the buildsystem

Looks okay now ;p.