some stuff including link-awesome
More work
Merge