Master

Currently being revised