Feature/commonize

Attempting to merge latest changes into my fork