Added some specs and refactored loading a bit