Entensions now fully implemeted + updated views