Changes done in first session

My changes, haven't merged in jamie's yet.