Wip

@alanshaw: I open this PR to get some feedback from you.