Fixed all methods, main include statements correct