#1 added modal etc
#1 added files