Kind of... forgot to add some files.
Splitting some crypto stuff into classes/interfaces.