Buildfix... Trying to structure things again.