Rework to allow for better versioning

#322