Included library files & changes

More work coming this week.