Added basics. Need to fix layout