Second Commit … Move even more things over to blocks