Added stuff & tests