[0.2.2] Work in progress
*Nothing is finished, just pushing for backup reasons