Modified - Class files and working through early Nil def