A pull request for Javi's code review

Please leave any comments on my code here! (Or use any other means you'd like: inline comments, diffs, whatever). 

THANK YOU SO MUCH!