Implements proper variables, closes #19