new more rest like api, broke everything. :)