Init check-in. Lots of cleanup to do