Misc
Calculator now works with abstract shape