Lots of changes

More code...