Add ability to add equal blocks via API.
Code cleanup

Remove TODO items that have been dealt with.