Added pieces of old project that could be useful to this one