:smoking: pulling changes
:smoking: edging closer to logic completion