Initial commit (still issues to deal with)
major rewrite of variables