Lots of changes. New stuff