Implemented More questions

still need testing