WIP: Cleanup and refactoring. More completion blocks.