Daniel

Merging some initial buttons into master.