WIP: better init + timing