Branch a

Some initial changes