diff --git a/loaders/index.js b/loaders/index.js
index 7ef64c2..2abd85a 100644
--- a/loaders/index.js
+++ b/loaders/index.js
@@ -1,11 +1,13 @@
 const passportLoader = require('./passport');
 const expressLoader = require('./express');
 const routes = require('../routes/API');
+const swagger = require('./swagger');
 
 module.exports = async (app) => {
     const express = await expressLoader(app);
     const passport = await passportLoader(express);
     await routes(app, passport);
+    await swagger(app);
 
     console.log('loaders called');
 }
\ No newline at end of file
diff --git a/loaders/passport.js b/loaders/passport.js
index 5dd1bd8..6835d16 100644
--- a/loaders/passport.js
+++ b/loaders/passport.js
@@ -4,7 +4,7 @@ const LocalStrategy = require('passport-local').Strategy;
 const AuthService = require('../services/AuthService');
 const AuthInstance = new AuthService();
 
-module.exports = (app) => {
+module.exports = async (app) => {
     app.use(passport.initialize());
     app.use(passport.session());
 
diff --git a/loaders/swagger.js b/loaders/swagger.js
index c00cfc3..acb6a29 100644
--- a/loaders/swagger.js
+++ b/loaders/swagger.js
@@ -4,8 +4,8 @@ const fs = require('fs');
 const path = require('path');
 
 // Loading via yml.safeLoad to avoid errors with special characters during processing
-const swaggerDocument = yaml.safeLoad(fs.readFileSync(path.resolve(__dirname, '../swagger.yml'), 'utf8'));
+const swaggerDocument = yaml.load(fs.readFileSync(path.resolve(__dirname, '../swagger.yml'), 'utf8'));
 
-const app = require('../server');
-
-app.use('/api-docs', swaggerUI.serve, swaggerUI.setup(swaggerDocument));
+module.exports = async (app) => {
+    app.use('/api-docs', swaggerUI.serve, swaggerUI.setup(swaggerDocument));
+}
\ No newline at end of file
diff --git a/server.js b/server.js
index a090e75..0369bf1 100644
--- a/server.js
+++ b/server.js
@@ -5,7 +5,7 @@ const PORT = process.env.PORT || 8088;
 
 async function start() {
     const app = express();
-    loaders(app);
+    await loaders(app);
     
     app.listen(PORT, () => {
         console.log(`Listening on port ${PORT}`);
diff --git a/services/CartService.js b/services/CartService.js
index e35902a..4c783a5 100644
--- a/services/CartService.js
+++ b/services/CartService.js
@@ -19,7 +19,7 @@ module.exports = class CartService {
 
     async addItem(userid, item) {
         const cart = await CartInstance.findOneByUserId(userid);
-        const item = await CartProductInstance.create(item);
+        const newItem = await CartProductInstance.create(item);
     }
 
     async removeItem(userid, item) {
diff --git a/swagger.yml b/swagger.yml
new file mode 100644
index 0000000..e69de29