Dev

update local and begin more work on it