WIP update; specs still WIP