v2 Added list. Working on fixing other pieces later
fixed a bunch of bugs