Switched up if/else database info
Updated our sub-branches