still missing some things but they were missing before anyway. so it's probably better to just push and deploy already. Reviewed-on: #1
a