Replaced some code with some Stubs. Not sure I fully understand this yet, but I'll keep at it.