Started improving branches functionality