Added a lot more sections - taken from working and proven system