Done some progress and fixed that cursed short tag
Preparing classes so that the editor may soon have something to edit