Reworked many things, angular in full swing.