Added a bit more

Will do the bulk of the work in the next couple of days