added buttons; functions currently commented