refactor, start adding speedtest
big refactor, adding speedtest, work in progress, tmp commit