Code clean up - Will develop new features on separate branches.
Got rid of dynamic slot painting