added test and organizer
Clean up unneed functions