Began to layout class information
updated some methods