Rectangle -> swift (partial)
Finish Rectangle, swift tweaks