hax for the first milestone (needs some fixint/tuning)