Some new stuff and classes