Additional Functionality

Also switching computers