some stuff using libs properlly
moved stuff around and better libraries