WIP with some issues; rename some variables