All functionality has been added. Need to clean up the code now.