Charlie's first iteration

Added things.