Working build, not organized

Added working sorting