Added stuff from class and sql dump