Finished phase 5

Signed-off-by: Ariel Voskov <Einstine1984@hotmail.com>