added some structure, let me know what ya think