work in progress, mergin lasthit anyway