commit
Tested working for most parts. Some UI + code improvements to be done.
recommit