Commented most classes, code finalised