WIP update, might build manifest now