cleaned up master to separate out branches