Add index-project!
Don't blow up on defmacro
Update TODOs