Got rid of TODO and added rectangle
merged pull
FIXED MERGE