implemented shape facade and simplified shape calls

but there is plenty to simplify