changed some variables and adding extracts
erd changes + stuff