3rd commit: FINALLY GOT THIS SHIT WORKING