Cleaned up scheduler and added stck