Resley

All changes are valid and can be worked upon. Merging.