Working on some parts
Merge origin/master