made it work for every setup
finished implementing the new scheme
looks like i don't like pulling while at work