temporal fix
fixed non-updating bug, modified build function to include listeners - work in progress