Some edits - note to finish this tonight