QA commit 1 & implemented traits