wip removing functions from platform files
wip moving -make-with to core, compile problems persist