Added new stuff in preperation for better organization