movin stuff around
add buttons
update todo