2a pretty much done