All the implementation

Work we did Friday from 5 to 6 ish