Minor refactor, major refactor coming soon with more documentation