Added Text Class
Added Location Class