Finished all of the feature - BUT need thorough TESTING!!!