synced repo with my dev code, lots of changes from last night