[PR] Moved old implementation + this is getting somewhere