End of the first creative rush

Next commits should be way more organized, small and relevant to one and
only one subject. Hopefully