Made this shit work. No mo errorz.
Merge branch 's3'
Commented some errors out
Merge branch 's3'