Refactored a few things in 1.1-1.4