Interface

Merging the interface branch as well. 
New changes may keep cropping up oh but we're doing just fine as of now