Feature/bugzilla

Ready for review.