Commented out testing code for WIP