Merged work from PillPlatter and work from Skewdy