Still Cleaning up initial structure