Version 0.0.6 in progress 3/19