Add rebuild (properly this time)
:scissors:
Merge branch 'rebuild_api'