Major update

Still lots of hardcoding, cleanup to do. But transitions seems to work