Feature/bmackall/buggy