Bugfixing. Build probably still no good.