Merging Ryan Varley's repository