wrote more in methods
rearranged sections