More work. Got code and end/begin stuff.