Major API rewrite, PC possible as output