Completed coding everything and tests looking good =D