Checkpoint 1

Not much changed here, but just want to have it completely up to date.