Completed part 3, still testing

Signed-off-by: Stacy Jung <stacyjung94@hotmail.com>