Rectangle refactor

Abandoned initial implementation