Copied jacob's stuff into repo