Refactor to use the library

Signed-off-by: Anthony Anderson <LordIllyohs@gmail.com>
This has been bugging me for a while

Signed-off-by: Anthony Anderson <LordIllyohs@gmail.com>
Think i fixed the build.gradle

Signed-off-by: Anthony Anderson <LordIllyohs@gmail.com>