Refactor even more  and almost have MyComicShop working