All functional. Final touches
merge