A lot of refactors; Some bug fixing; Add backgroung jobs; Minor improvements