Added drawing and FinalActivity classes