solved 7 and 8
restructured and solved all to 12