Commented Classes, Also looks like git got messed up somehow