Version 0.0.6 In progress 3/19