FINISHED. All left to do is make things look pretty :)

Signed-off-by: Jedabero <jedabero@hotmail.com>