Added basics
Added Testing stuff