Started writing on some ideas for better structure e.d.