Buttondev

@grinner I think this is clean enough to merge into master and then branch again for additional development