Getting closer to a workable version