Added basics
Finish Tests and BootStrap