Added more shape drawing abilities

Needs completion
May extend later