merge jonworking into brandonworking