fixed bugs, actually works now
fixed bugs, actually functions now
fixed merge conflict