trying to make a new approach
works now. kind of
merging